Generic Handler merge
Remove conflicts