Resolve .lock
#44 resolve Conflicts