fixed some merge confilcts