times did not import cdat_info leading to errors

My laptop freaks out about it, does a normal merge (--no-ff) seems happy, no conflicts... Tells me rightfully I'm 2 commit ahead of devel/master. Great. Then when git pushing it says everything up to date.... I'm going crazy... So doing it from github...