Add type
Fix merge conflicts