Bugs and merge