solved issues with updating from upstream