sweet nothings, just syncing up
fix conflicts