Removed old conflict remnants