Merged fork and fixed merge conflict