fixes improper merge / changes