resolved conflicts due to poor use of git branches