Merging from the main project