pre merge commit
merged
added technology coldmine