Removed conflict left over