Resolving conflict with master.