Resolved morge merge conflicts