editing dialogue
file error fix
fixing merge issues