Proper comment transportation during merge process