sleep log
fix conflicts