adding init script
resolving merge