Controller Selected Contact
Fix merge conflits