project configured to reduce git conflicts