Fixed unforeseen merge issues