fixing compilation issues due to committing conflicted files