commit by 1st
conflict resolved