fixes for merging two branches