Fix #55
resolve conflicts