Persit marker
Fix merge conflicts