fix
fix conflicts and add date to logfile