Ok to merge into master, resolve conflicts, and delete branch