Finishes merge with master