Add current/head
Fix merge conflict