removes merges conflict lines and stephen's comments