fixing mine merge isues