first commit after pull
resolve conflict