solved a5 merge