remove auto-merge conflicting account mechanism
bug fixes