updating error free from merge conflicts on last commit