[~] Got to hate GIT sometimes... it auto resolved a "conflict" by shoving a line in the middle of nowhere...