finalizing merge with master