Added conveniences and mac setup of p4 merge