ashwin/melanie | resolving merge conflicts