added a couple of tests for compilation errors
resolved a conflict