fixing more merge stuff