Deleted unneeded merge conflict file