remove line added in merge