temp commit
merge and solve conflictions
add all controllers