Thanks, this was conflict resolution gone wrong :)