Okay we are going to try merging again