merging with my project