diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index 4197079d4..dc454d77b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -122,11 +122,18 @@ export default {
 </script>
 
 <style lang="scss">
+<<<<<<< HEAD
 
+=======
+>>>>>>> fec27babbe6b902b1de8a1b15ffac49c4e0b02b3
 .no-address-yet {
    text-align: center;
    box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
    padding:1.5rem;
+<<<<<<< HEAD
+=======
+   margin-left: auto;
+>>>>>>> fec27babbe6b902b1de8a1b15ffac49c4e0b02b3
    i {
       font-size:2rem;
       margin-bottom:2rem;