changes from project merged