current changes will be merged