fixed issues related to merge with master