Github resolve merge (last)