Cleaned up a merge file and made it compile on my machine