Resoved merge conflicts