Code added in master to check for conflict