Saving current state for merge
Fix merge conflict