initial setup
resolving merge