fixed issues due to merge conflicts