fixing more merge stuff, fixing hovers and sea line