conflict update

might need to roll back to previous version after this commit & sync