mobile fix
conflict resolution