fixed conflict and added packagediagram