git conflict master with 1.5