joddev utils changes
resolve conflicts