fixing errors created by am merge a few commits before