conflict created 1st
resolved conflict