segfault with px
merge conflicts solved