Fixed error after merging