finished application controller
solved merge