commit to pull code
resolve conflict