Remove <<<<< Head ===== and shait