Removed conflict after merge