Resolve differences between master and production