resolved conflicts with git commits