intro + mechanics to git conflicts