fixed unnoticed merge conflicts