You probably have a merge conflict here that needs to be solved. This is in a helper method now.