Delete merge conflict and path issue