Removed some git conflict left over