Added getpath and setpath
merge confict fix