merged both versions of the project, hopefully successfully this time