Removing merge mistake