removing debug
resolving merge