new branch commit
resolve conflict