My stuff of compute 4 after solving merge conflicts