Fixed leftover merge conflicts