got rid of merge conflict practice code