Fixed additional merge conflicts