Fix merge

Author: lenemter

src/BaseItem.vala

@@ -146,7 +146,7 @@ public class Dock.BaseItem : Gtk.Box {
             Granite.TRANSITION_DURATION_OPEN,
             new Adw.CallbackAnimationTarget ((val) => {
                 bin.allocate (icon_size, icon_size, -1,
-                    new Gsk.Transform ().translate (Graphene.Point () { y = TopMargin.SIZE + (float) val }
+                    new Gsk.Transform ().translate (Graphene.Point () { y = (float) val }
                 ));
             })
         );