merge conflict
added stub for history