resolved all conflict tested to another app