Removed conflicts to stop unexpected behaviour