fixing little merge conflict