fixed views merge mess