AT: Fixing the failed branching errors/wrongly committed files