It looks like you only added back this single line. We'll need all original content of this file in order to merge (none of it should be modified).