all works after merge