fixed merging error. updated other settings