Fixes conflict from merge