Fixing more merge issues