Making the project compile after merging