file endings (no php-closing and one empty line)
some additional docblock
rebase error fix