resolving conflicts
fixing conflict problems