controller added and pull conflict resolved