ticket:5 for #5 resolving merge problems