updated postboxresource
fixed conflicts