Merging master project