revisi 1.0
merging