controller work good
fix merge problem