full path instead of ~ thing
don't share history
removing debug markers
resolving conflicts