fixed problems after merging