fixed mess with source files that resulted from the merge