resolving conflicts after merging with master