Removed  conflicts