Resolving conflict with master