merge controller changes