Read me updated with instructions
resolving conflicts