Fixed conflict from merge