Removed missed conflict line