Attempting to merge with master