didnt work condition check, back to stable
testing merging