Attempt to fix bugs merge