fixing merge file