Resolving conflicts with master