fixed merge conflict errors

everything should be merged now