Bugs merge