merge with pbiecek