merge
merge conflicT
commit all
functional CAS login
push
merge conflicts