Merging master with my set